(custom-variable-prompt): Handle variable-at-point returning 0.

diff --git a/lisp/cus-edit.el b/lisp/cus-edit.el
index c4d6b7f6c2ff41b871d85f44cd35ac908a728638..8c4bf9deef61faa27e9cebac3a6cd6fd86458d40 100644 (file)
--- a/lisp/cus-edit.el
+++ b/lisp/cus-edit.el
@@ -362,7 +362,7 @@ Return a list suitable for use in `interactive'."
         (enable-recursive-minibuffers t)
         val)
      (setq val (completing-read 
-               (if v
+               (if (symbolp v)
                    (format "Customize variable: (default %s) " v)
                  "Customize variable: ")
                obarray (lambda (symbol)
@@ -370,7 +370,8 @@ Return a list suitable for use in `interactive'."
                               (or (get symbol 'custom-type)
                                   (user-variable-p symbol))))))
      (list (if (equal val "")
-              v (intern val)))))
+              (if (symbolp v) v nil)
+            (intern val)))))
 
 (defun custom-menu-filter (menu widget)
   "Convert MENU to the form used by `widget-choose'.